auto merge of #1042 : cgaebel/cargo/execute-main-with-custom-args, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 12 Dec 2014 21:13:52 +0000 (21:13 +0000)
committerbors <bors@rust-lang.org>
Fri, 12 Dec 2014 21:13:52 +0000 (21:13 +0000)

Trivial merge